issue 38
Merge pull request #48 from yurikuzn/master

issue 38