Better example component
Merge branch 'master' into cdn-react