Preparing release 2.0.4
Back to development: 2.0.5