Merge pull request #1 from mathias/retab_and_trim_whitespace

Retab and trim