DIYMaster_Ref-First partial commit

26/04/2014