Fix issue #151
Merge pull request #187 from ivanoffalex/dev

Fixed issue #151