#543 strip whitespaces

Didn't find a clean way to test this...  any thougthts?