ticket 531
Merge branch 'master' of https://github.com/xiechao06/lite-mms