Issue89

Display current task_state if not null . If null display vm_state as previously.

NB: I will add somme unit tests after a rebase from your master