Lots more updates
Merge branch 'master' of https://github.com/yipenghuang0302/csee4840_14