Fixes #10 and Fixes #11 Added and renamed template