Merge pull request #37 from Takeatea/master

Changed to model class to ease override
Added comment status constants
Merge remote-tracking branch 'upstream/master'