Merge joneshf/more-options