Change author
Merge pull request #5 remote-tracking branch 'mark/master'

Conflicts:
	README.md