Strip whitespace
Manual merge. Closes #315