Merge pull request #124 from glynnc/master

Mostly generator-related changes