Fix #317: Take II
Merge branch 'master' into fix_#317

Conflicts:
	README.md
Merge branch 'fix_#317'