Some changes to MainClass
Merge branch 'master' of https://github.com/jwischnewsky/Mithra