Small fixes to XML and generate SQL
Merge pull request #56 from pdelbar/master

Small fixes to XML and generate SQL