This fixes #6, closes #7, and resolves hacdias/InMVC#8