Merge pull request #258 from sergeyklay/master

Calemsw