Consistent spacing after comma
Merge branch 'ldenman-patch-1'
Merge #306