Fixed an issue with multiple commas in comments.
Merge branch 'feature/notes' into develop