Changes to program output
Merge branch 'master' into linux-build