closes #162
Merge pull request #165 from it3s/fix-for-issue-162

closes #162