Review autoloader
Merge pull request #109 from cbonnissent/reviewAutoloader

Review autoloader