Merge changes from pull reqeust #92 and add a test for missing templates