Merge branch 'hotfix/v2.0.1'
Merge branch 'release/v2.1'
resolves #164
Merge branch 'hotfix/v2.1.1' into develop