Use the same padding method as the app

fixes Issue #3