Had 500 error
Merge pull request #31 from anniezhn/azhang

Had 500 error