Merge branch 'release_v1.0'
Cleanup