Add support for zero padding
Bugfixes