#5 fix for strange xsd :)
Merge remote-tracking branch 'origin/master'