Last changes for first stable version