Fix options
Merge commit '98d9707'
Merge branch 'master' of github.com:GoliathUA/JF-Plugin-Jimbo