bug fix
Merge pull request #57 from pelikanchik/timur

bug fix
Merge pull request #58 from pelikanchik/master

update from master