Merging v1.0.0 develop to master