Minor update
Merge branch 'release/1.0'
Wrapping it all up