zrho Merge pull request #24 from ritschwumm/patch-1 …