Develop

Merge develop into master for release 1.1