Update
merging
comment model added
Merge pull request #45 from YfLn/yufan

Yufan
Merge pull request #47 from YfLn/master

Updating Richard branch from master