some parsing fixes for Citadel
Merge branch 'master' of github.com:anura-engine/anura