Cleanup for bb5e00cdfa1e990c317786f8a132cf98b8991e64
Merge pull request #24 from arb/master

Cleanup