New merging with improvements from Matthias Guth.
Merge pull request #19 from claudius108/master

New merging with improvements from Matthias Guth
Merge pull request #20 from ChiSamurai/master

removed import of uri-util.xqm
Merge pull request #21 from ChiSamurai/master

some bugfixes after merging 1.2.1.1 to stable trunk
Merge pull request #22 from ChiSamurai/master

Further bugfixes and improvements