Update README.md
Merge branch 'release/0.2.4'

Conflicts:
	README.md
Merge branch 'develop'

Conflicts:
	README.md