Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Merge pull request #1 from MDCore/master

Add some notes to the README