Merge pull request #49 from sirocyl/patch-1