Better middleware.
Merge pull request #49 from BCAAFC/master

Better middleware.