safer redirects
Merge branch 'master' of github.com:Nakiami/mellivora