Merge pull request #5 from trecouvr/master

Use same concept as Slim