Merge pull request #21 from agbeltran/master

Added rewrite rules
Fixed redirection