Updating templates and adding error checking. #17

Closed linusx closed 6 years ago