Merge remote-tracking branch 'abel/master'

Conflicts:
	README.md
Merge remote-tracking branch 'kally/master'