Reworked redirection
Merge pull request #136 from romanchyla/redirection-fix

Reworked redirection