First commit

First commit of this fork :
* Added XML parameters support.
* small fixes