Modifications for integration purposes.
Merge branch 'master' of github.com:yipenghuang0302/csee4840_14