encode data before print
short description unified with -h
Merge branch 'master' into plugins

Conflicts:
	README.md