Last changes for release 0.0.2