0.6

Merge 0.6 to master