Add a padding check...
Merge origin/master