Another fix.
Merge remote-tracking branch 'remotes/origin/bugfix-august'

Conflicts:
	README.md
Merged with bugfixing-august