Merge pull request #214 from CyberCRI/refactor/GenericLoader

Refactor/generic loader