prereq
Merge remote-tracking branch 'svigneux/master'

Conflicts:
	README.md