Fix bugs
Merge branch 'master' of https://github.com/dmare/MC2