Merge push request #2 remote-tracking branch 'kurt/master'

Conflicts:
	README.md