Match XML output to Kind 1 and JKind
Merge pull request #25 from chsticksel/kind2-server

Match XML output to Kind 1 and JKind