Merge branch 'wip/v1.0.0'