Merge pull request #81 from raistlinthewiz/develop

More GenerationTransaction work