Handle multi-line comments correctly when saving

Closes #55