Fix minor bugs.
Update version numbers.
Merge branch 'release/1.0.1' into develop