Spock said (gs-981)
Merge pull request #6 from chris-allan/khan

Spock said