Fixed missing pad function
Merge