Fixed null solution and problem in Task Manager
Merge branch 'master' of github.com:padzikm/ComputationCluster