restored functionality (at least I think this is how it used to work)
removed commented-out code, moved formatting into the right place
Merge pull request #2 from CarlQLange/master

restored functionality (at least I think this is how it used to work)