pushing last changes for 0.3 version