updating to 1.0.3.44-beta templatebuilder. Resolved #88 Resolved #87 Related to #89