correcting paths
Merge branch 'develop' into gh-pages

Conflicts:
	README.md