Refactor to work with PBC autoloader
Merge pull request #31 from wagnert/master

Refactor to work with PBC autoloader