Merge pull request #467 from lukecotter/feature-dynamic-import

Merge pull request #467 from lukecotter/feature-dynamic-import #113