fixed logic problem on 404
Merge branch 'development'