updated settings
Merge branch 'master' of github.com:robertfw/st3