In development
Merge branch 'master' of https://github.com/ContinuumBridge/canary_app