Added "-h" and "-v" arguements
Added 'clioutput' function for use with "-v"
Merge remote-tracking branch 'origin/master'

Conflicts:
	zpn.py