Merge branch 'hotfix/2.0.1'
Release v2.1
Merge branch 'release/v2.1'
fix hirarchie of versions in changelog