Merge branch 'master' of https://github.com/bjorvack/Carma.git