Merge pull request #14 from Lastique/patch-1