Demo optimization.
Merge pull request #8 from jdevuyst/master

Demo optimization.