Merge pull request #13 from jaimieli/comments

most up to date
Merge branch 'master' into comments