Minor fixes that were suggested after a live demo
Merge pull request #44 from anhu/master

Minor fixes that were suggested after a live demo