merge master and basic_email