Cosmetic changes.
Fixes issue #42 (https://www.s3it.uzh.ch/support/issue42)