Fix internal server error
Cosmetic fixes
Merge pull request #1 from stoyanster/master

Fix for Internal Server Error