Set version to 1.0
Merge branch 'test' into development