Merge pull request #147 from senquack/cdrom_sstate_fix