Merge pull request #1 from siyegen/master

Fixes for the demo
loggy log log
Merge pull request #2 from siyegen/with-logs

loggy log log