cleanup whitespace
Merge branch 'dev'