added strip whitespace on save
merged