Preparing release 2.0
Back to development: 2.1