merge DIY_Biz with master