first version, taken out of global-config
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
README update