Updated with new example from master