Merge pull request #653 from jdgleaver/core-options-v2