Develop

Pushed all updates for 0.6.0 release