Merge pull request #7 from rogersachan/patch-1