did some bugfixing
Merge branch 'master' of https://github.com/loizuf/MME_Project