Patch 1.0

Yes, you are of course correct... not all white-spaces are trimmed (tab, newline, + ?) - so this should be fixed back or carefully tested (unit tests are always welcome:)