Added double loading and bug fixing
Merge branch 'refs/heads/hev-branch'