Conditionally load classes in controller - fixes #50
Merge pull request #63 from prioritypie/develop

Conditionally load classes in controller - fixes #50