bits n pieces
Merge branch 'master' of github.com:jasperblues/Typhoon-example