Merge pull request #924 from GeneFerneau/alloc