Fix for Options
Merge branch 'master' of https://github.com/DASISH/TERESAH