[KLS]

Merged this, thanks.

Might be easier to use pull requests on github over diffs. Though I realize some people are a little wary of git still so we will still accept diffs for a long time.