Fix comments including newlines
Merge branch 'working'