More cleanup.
Merge branch 'master' of github.com:dankurka/mgwt