Merge pull request #95 from daniellemayne/develop

Develop: upgraded and tested to latest core
Merge remote-tracking branch 'upstream/develop' into develop
updated capabilities