test marked
merge
update version
options for marked
new version
Merge branch 'release/v0.3'
Merge branch 'release/v0.3' into dev
cleanup
Merge branch 'dev'