Human readable, adjustments to terminal
Merge branch 'master' into vertigo