Last improvements before releasing v1.0