Merge pull request #1 from mmbot/master

myaa
Merge branch 'master' of https://github.com/jamesbascle/mmbot