Merge pull request #32 from hachre/patch-1