update capabilities
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #30 from daniellemayne/develop

update capabilities