Fixed bug in printing.
Merge branch 'test' into dev