Updated to reflect changes in core
Merge pull request #199 from maksimov/develop

Updated to reflect changes in core