Load speedup

Fixes issue #65