Don't always load

Update autoload to only load when needed.
Merge pull request #1 from tag/autoload

Don't always load