Merge pull request #40 from NochEinDirk/my-contribution

Towards #28 ready for live ...