Merge pull request #334 from jdgleaver/options-update