Fix Serve Issue
Merge pull request #2 from stevensavery/master

Fix Serve Issue