Dev

Merging dev into master for stable release 1.0.0