Updated readme and pulled in changes from CommentCore
Merge with master