Fixes Issue #2 Template Changes