Merge branch 'hotfix/0.0.7' into develop
Added annotations
Merge branch 'release/0.0.8'