Demo code, improved usability. Slightly improved docs.