Should solve issue #7 by saving options whenever they are changed