Merge pull request #296 from kosmakoff/dev

Fixes for issue #295