[MOD] Minor refactoring.
Merge branch 'master' of github.com:JohannesLichtenberger/sirix