Merge pull request #181 from mrtazz/patch-2