put recent additions into master