Fix demo issues.
Merge pull request #14 from maximevaly/master

Fix demo issues.