Proxy support; better error handling
Clarify documentation, fix error in showErrors function
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md