Merge tag 'v0.0.2' into develop

0.0.2