Merge remote-tracking branch 'origin/develop'

Conflicts:
	README.md

Pre-v1.2 merge.

Various bug fixes.

Version 1.1.1

Updated readme for 1.1.

Improved log message.

Update README.md