BUGFIX: 'name' should be $name
Merge branch 'better-autoloading'