Some corrections
Merge branch 'master' of github.com:rogeriozambon/hawking

Conflicts:
	README.md
Some adjusts