Updated coding style and fixed tpl
Added better classes to the output
Merge remote-tracking branch 'origin' into release