t52
Merge branch 'master' into t52

Conflicts:
	README.md
Merge branch 't52'
Merge branch 'master' of github.com:rngmontoli/GitTest