Improvements to generator behavior
Merge pull request #1120 from kimroen/properly-accept-camelCase

Some improvements to generator behavior