Merge branch 'refactor'
Merge remote-tracking branch 'origin/xml'
small fix for disassemble()