Working on the printing
Merge branch 'travis9'
change conflicts