Fix newline bug
Merge branch 'master' into prefs
Fix newline bug

Actually closes #22
Merge branch 'master' into prefs