Trying to fix things
Merge branch 'master' of https://github.com/jdehlin/MatrixApi