Merge pull request #33 from hachre/patch-1