merging to master week 8 hieu and Tom