malloc -> calloc
Merge branch 'master' into portable