Merge branch 'v.0.2'
Merge branch 'master' into v.0.2