[#85] Fixed all redirects
Merge branch 'hotfix/85' into develop