Merge pull request #50 from cgolubi1/infrastructure

autoloading!  finally!
Merge remote-tracking branch 'upstream/master'