Merge branch 'master' into dev
typo in readme
type and website urls fixed in readme
Merge branch 'dev'

Conflicts:
	README.md
added DOI and markup to readme.
added markup to readme