Merge pull request #240 from retro-wertz/core_options