Adding config comments and changing to tabs
Refactoring to make more terse and match code conventions
Merge pull request #1 from BKWLD/mhaszprunar-patch-1

Mhaszprunar patch 1