Merge pull request #172 from denis-mentey/dev

Fixes #165