m3 done
m4 done
Merge pull request #24 from winstonho/master

update