Merge pull request #78 from vmalloc/fixes

Fixes