Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge pull request #1 from BoffinFactory/test

Merge remote-tracking branch 'origin/master'