Release v1.0

Merging dev into master