Updating documentation
Merge remote-tracking branch 'mauricios.Apache/master'

Conflicts:
	README.md