Changed 404 error response
Merge remote-tracking branch 'origin/master'