Version: 0.2.5

+ Changes options from individual values to list of values; remove hard-coded defaults.
Merge branch 'dev'