Merge pull request #2 from holomorph/master

autoloads