fixed whitespace
simplify whitespace removal
Merge branch 'master' into pr/104