Improved efficiency.
Fixed output in demo application.
Merge pull request #1 from sn0e/master

Improved efficiency.