Merge pull request #6 from ilesinge/fix_redirect_invalid

Fix redirection to home on invalid token
Fixes for PSR-4 directory structure