Merge pull request #10 from cottage14/patch-1