Merge branch 'testing'
release 1.0.0