Last changes for version v0.0.3