Basic functionality complete
Merge branch 'release/1.0.0'