Fixed the issue that caused internal server error
Merge pull request #3 from CWGran/development

Fixed the issue that caused internal server error