Merge pull request #180 from mrtazz/patch-1