Merge pull request #732 from sergeyklay/master

Some fixes
Fixed issue: Fixed previous commit