Fold in changes.
Merge branch 'release-0.0.2'