Updated to reflect the latest core changes
Merge pull request #100 from maksimov/develop

Updated to reflect the latest core changes