Added proper 404
Merge branch 'master' into testing