BUGFIX discard extra whitespace
Merge branch 'BUGFIX_whitespace'