Merge pull request #11 from winstonho/master

M1 done
Merge pull request #12 from winstonho/master

M2 DONE
add review
Merge pull request #7 from lyDASHsBOK/master

merge 13