Compare against options set to_s as locally I get an integer 1 instead of string 1.  Refactor to reduce repetition of changes.
Merge branch 'get_working_on_mac'