Dev/reset master