typedef added to gamete_base
Merge branches 'addtdef' and 'master'