Merge pull request #137 from is-valid/688comments

688comments
Merge branch 'dev' into 688comments