Bugfix for #5 - template option