Cleanups
Merge pull request #3 from Seldaek/patch-1

Cleanups