Merge pull request #1 from bhwarren/master

wat
fixed spaces and formatting issues
Merge pull request #2 from wbv/master

Use tabs instead of spaces