Added v.0.3 changes