Fix #257
Merge pull request #258 from kazimuth/master

Fix #257