pulling.
Merge master branch. Includes content from the demo presentation.