First pass at implementation.
Merge branch 'release/1.0'