Updating to latest templatebuilder. Resolved #109