Merge pull request #394 from mhotan/phase5_development

Attempt At fixing bugs revealed in Demo
Merge branch 'master' of https://github.com/blasv/DineOn into phase5_development