minor bug fixes
Merge branch 'master' of ssh://git@github.com/teamaccount/MMS.git