master@75550412
Merge branch 'pr/1'

Conflicts:
	README.md
Merge pull request #3 from 75550412/master

master@75550412