Some fine tuning after the recent general modularization.
Some fine tuning after the recent general modularization.
Merge pull request #553 from oliverschmidt/master

Some fine tuning after the recent general modularization.