Streak's pull request

Pretty please?