Last improvements for version 0.2.0