Merge branch 'release/v2.1.1'
Merge tag 'v2.1.1' into develop

Release 2.1.1
Add Tox file for testing