Last changes for Version 1.0