Updated with latest example changes from master