fixed xml xi:include issues
fixed optional arguments [, ]
Merge pull request #9 from IlanFrumer/master

fixed some issues