Added a demo and simple bug fixing.