mai update
Merge pull request #28 from dmode/master

update