Fixed #36. Fixed #35. Added missing templatefile.