Merge pull request #308 from cyberious/master
(maint) Only add newline if string does not end with newline