Fixes #271
Merge pull request #297 from kosmakoff/dev

Fixes #271