Improvements
Merge pull request #187 from 28msec/create-report-from-template-improvements

Improvements