Master changes
Merge branch 'master' into Fix-2

Conflicts:
	README.md