Merge lastest code from Univ. of Miami to LBL