work on issue #62
Merge pull request #77 from vitalypylinsky/master

done issue #62