Add padding
Merge branch 'master' into reggov_update