Update README.md
Merge branch 'master' into dev

Conflicts:
	README.md
Merge pull request #5 from ratso/dev

Dev