Develop

Merging version 1.0.0