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

Updated to compile against the latest core