Merge pull request #1 from orignal/master

merge with master
update

устранены ошибки компиляции
Merge pull request #7 from mikhail4021/master

compilation errors solved