Merge pull request #328 from retro-wertz/sanitize_gpu_adv_options