ShenJungmao m1 and 2 done
Merge pull request #23 from winstonho/master

ShenJungmao m1 and 2 done