Removed autoloads in attempt to fix #21