return of settings...
Merge branch 'master' of https://github.com/TonyMalz/IS-B
merger merge!