Merge branch 'pr/5'
Whitespace fixes