from mac
Merge branch 'master' of https://github.com/lixiao89/MBot

merge things from ubuntu
update