Add documentation comment.
Fix spelling error/typing mistake.
Merge branch 'master' of github.com:jasperblues/Typhoon