htmlDemoTemplate option added
Merge branch 'andreu86-master'