added 500 error site
Merge remote-tracking branch 'origin/master'