merging develop into master for release 1.3.0