Merge branch 'master' into v0.0.5
Update components.json
Merge branch 'v0.0.5'