got rid of some warnings
no extra padding needed
Merge pull request #636 from nelenkov/dev

got rid of some warnings