Fixes issue #7 -- 404 error page
Merge fix