Dev - merge 1.0.0 into master ready for release