Added support for X template
small fix
cleaning
now the demo app is a consumer of the library