Merge 0.6 with Master

Merge 0.6 with Master