Merge pull request #233 from sergeyklay/master

Core version