Merge pull request #11 from winstonho/master

M1 done
Merge pull request #12 from winstonho/master

M2 DONE
add review
update
Merge branch 'lyDASHsBOK-master'