Fix issue 174
Merge pull request #176 from alivedise/issue-174

Fix issue 174