Merg v0.06 into master

Merged v0.06 into master