Merge pull request #315 from Deses/master

Just  Just a quick fix for the Front-controller pattern.