Merge from master
Merge branch 'gh-pages'

Conflicts:
	README.md
	index.html