Merging develop into master for v1.2.0 release