Fixes to make errthang work well..
Merge branch 'master' of https://github.com/n1ck3/sonar

Conflicts:
	README.md