Expand templates

From Biolinux.net
Expand templates