[BUGFIX] Respect Tempplate Path and Filename when already set
Merge pull request #564 from hmspl/respectTemplatePath

[BUGFIX] Respect Tempplate Path and Filename when already set