fixes #232
Merge pull request #237 from khoomeister/fixes-232

fixes #232