Adds template handling for issue #62.