Added a println
Merged both branches