Merge pull request #1 from 4294967296/develop

fix #2
change on master
Merge branch 'master' into develop

Conflicts:
	README.md