Merge pull request #184 from koobs/patch-2