More fixes!!!
Merge branch 'master' of github.com:arall/wwitt