bastelfreak Merge pull request #314 from bastelfreak/rel321