Just indent fixes
Merge remote-tracking branch 'upstream/master'
Merge pull request #52 from hile/master

Minor whitespace cleanup pull request