Merge tag 'v0.0.3'
Merge tag 'v0.0.4'
Merge branch 'master' into dev