Fixed options
Merge branch 'master' of github.com:coxande/Twik