I'm an idiot who removed too much. Shame on me. Also some clean-up.
Merge pull request #6 from mueslo/master

I'm an idiot who removed too much. Shame on me. Also some clean-up.