Including David's update
Updating example template generator --kazu