404 page fix, some advantages
Merge branch 'develop'