That should wrap up the cleaning spree
Merge pull request #121 from frankmayer/devel

That should wrap up the cleaning spree