Template changes to fix #52.

Fix for #52