Update README.md
Merge master into dev2

Conflicts:
	README.md
Merge pull request #3 from daniel-propertylogic/dev2

Update README.md