MCAPP 0.7

Shavarsh's merge