Feature/iss12

Requesting permission to merge Template issue #12 to develop to start using it.