Upgrade to the latest template

Fixes #40