Updated to compile against the latest core
Merge pull request #97 from maksimov/develop

Updated to compile against the latest core