Merge pull request #158 from janschoenherr/patch-1

code cleanup