Version 1.1

Content upgrade, new features, README update
Merge branch 'master'

Conflicts:
	README.md