Merge pull request #20 from makeupsomething/patch-1