Remove some Oxford commas
Merge branch 'develop'
Add ability to disable comments