added some memory allocation stuff
Merge branch 'mike'