Added discnumber support to CueDocument (with some PR changes)