Merge pull request #16 from svenrecknagel/master

Fixes from Sven