Clean up.
Merge branch 'master' of github.com:jasperblues/Typhoon