some changes
Last changes for release v1.0