Merge pull request #175 from lkoranda/patch-1