Clean-up. Fix missing record issue.
Version number
Merge branch 'release/v1.0.1' into develop