Further refactoring in loader.
Merge branch 'master' of https://github.com/klusta-team/klustaviewa