In sync with new renamed repo now
Merge branch 'master' into litrature

Conflicts:
	README.md

Resolved:
	Takes the latest changes from
	upstream master into the readme file