Added generate data method
Added demo for template
Fixed template
Merge remote-tracking branch 'origin/master'