Checks and build sanity

Resolve false errors during execution. Ensure that demo runs
Merge pull request #3 from tuxology/master

Checks and build sanity