Cleanup and add minor fix
Merge branch 'release/v1'