Small changes before the release of the version 1.0
Small bugfixes
Last changes
Merging release-1.0 into develop