merged mustache template branch