Keep examples in sync with master