Demo: Add more samples, fixes #212