Fix spaces in comment block
Merge branch 'dev'