Updated the examples to work again.
Merge branch 'feature-examples'