Merge branch 'master' for v0.0.6