Fix for #5 incl. console output