fix bugs
Merge pull request #16 from DmitryVoskoboynikov/feature/issue-116

fix bugs