Added everything
Merge branch 'master' of github.com:mgnusl/mmi