Fixed issue: Minor fixes
Merge pull request #758 from sergeyklay/master

Minor fixes