whitespace
Merge branch 'upstream' into cosmetics
Merge pull request #6 from attilaolah/cosmetics

Whitespace