Fixed #77, added check for track and disc number
Merge pull request #81 from fredg02/issue77

Fixed #77, added check for track and disc number