Added 0.0.6 changes