Fixed a printing bug
Merge branch 'master' into abstraction