Bump up version to 1.0.0
Merge branch into develop