Readability
Merge branch 'v0.6'