fix #89
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/xiechao06/lite-mms into issue91

Conflicts:
	lite_mms/basemain.py