Fixed serveral errors
Merge branch 'master' of https://github.com/sjoerdeeman/404-Name-not-found