Merge next into master - moving from v1.0.0 to v1.0.1