Another options framework update
Merge pull request #209 from aristath/master

Merge from master branch