fixed template and data export
Merge pull request #173 from paczian/master

fixed template and data export