Improved efficiency.
Fixed output in demo application.