Merge pull request #99 from craftjk/dev

[FEATURE] lazy load