Final fixes for 0.0.6.
Merge branch 'release/0.0.6'