Merge pull request #414 from rashidkpc/master

Zerofill tweaks