Merge pull request #199 from maksimov/develop

Updated to reflect changes in core
Added missing capabilities
Merge pull request #200 from andylyall/develop

Added missing capabilities