Merge pull request #19 from mendoncakr/master

MVP from today's demo