Got rid of the nonsense
Merge branch 'master' of https://github.com/TomFalkner/micasa