New template implemented. Fixes #42