Merge pull request #577 from gameblabla/cdrom_setloc_lib