changes from ponce
Merge from ponce git