Fix issue #161
Merge pull request #236 from codexa/issue-161

Fix issue #161