Fix issue #108
Merge pull request #109 from oleg-kravets/dev

Fix issue #108