add new version and tests
Merge pull request #357 from mimmi20/issue-356

Fixes #356