Merge pull request #7 from uwetews/master

-bugfix and enhancement on subtemplate {include} and template {function}