Merge changes in development branch to master for 1.1.0 release