Merge branch 'master' into gh-pages

Conflicts:
	README.md
github pages