updated loader, avoid complex code
Merge branch 'NRPUIV2' of github.com:capensis/canopsis into NRPUIV2