Merge branch 'master' of gist.github.com:/b85ea3e51440314e9d66

Conflicts:
	README.md