progress
Merge branch 'master' into windows

Conflicts:
	README.md