Release 0.6.0

Merge 0.6.0 changes and bugfixes