Short Demo could be done better
Merge pull request #18 from marcogarieri/master

Short Demo could be done better