updated master with add_employees branch