Pushed to 0.6.0 Beta