Improved the last commit a good bit (poor nomenclature, etc)
Merge pull request #2 from daviwil/PROCGEN-1

Improved the last commit a good bit (poor nomenclature, etc)