Merge branch 'master' into develop
Trying new authentication technique
Adding simple error handling to API login
Merge branch 'release/0.2'