Merge pull request #536 from gameblabla/cdrom_fixes