Merged issue #53 common.h changes to the code generator template file.