Finally updates master after getting off track with examples for Xander