last changes before releasing 0.3.5