Bug fix.
Update README and demo.