0.6 merge to master

Merge 0.6 to master