improved padding

Issue #53
Merge branch 'master' into generator-assets