merge capabilities changes to develop
Merge pull request #31 from daniellemayne/develop

merge capabilities changes to develop