Somewhat acceptable solution to whitespace problem
Merge branch 'no-whitespace'