Merge tag 'v0.0.2'
Merge branch 'master' into dev