Merge dev into master for v1.0