Add last changes for version 1.0