Boiled down stuff
Merge branch 'master' of github.com:conqp/MiSMaP