Last touches for version 1.0