Changes for vesion 0.2