Fix inconsistencies in terms of new lines, et al
Merge pull request #305 from rafalchmiel/fix-inconsistencies

Fix inconsistencies in terms of new lines, et al