Updated documentation and demo. Fixes #2