#18 Primary fix for options

Wrongly named variable. Also: double settings fields doesn't work.
Fixed #18.
Merge branch 'issue-18' into develop