bugfixes
Merge branch 'master' of https://wshager@github.com/wshager/xrql.git