Various changes.
Merge branch 'master' of github.com:3ft9/wigbe