Last changes to version 0.3