Removed trailing whitespace.
Made autoloadable
Merge branch 'autoload'
Added who modified by