Merge pull request #319 from retro-wertz/new_core_options