Merge pull request #278 from sergeyklay/master

Minor changes