Fixed up the kind class
Merge pull request #129 from GrahamCampbell/only-call-fixes

Fixed up the kind class