fixed a 404 bug
Merge branch 'dev'