Fixed end of task, see #19
Improved verbose log support