cleared up whitespaces
Merge branch 'dev'