corrected
corrected
Merge branch 'master' of https://github.com/eroluysal/mfr

Conflicts:
	setup.sh