Merge pull request #415 from negativeExponent/core_option_cleanup