fixed redirection
Merge branch 'dev'