Added new capabilities
Merge pull request #107 from andylyall/develop

Added new capabilities