Fix padding.right
Merge branch 'develop'