Merge pull request #320 from aparo/develop

Develop
Merge branch 'master' of https://github.com/aparo/pyes into develop
Preparing releasing 0.20.1
Merge branch 'release/0.20.1'
Merge tag '0.20.1' into develop

Release 2.10.1