oops
Merge pull request #130 from 958/kungfloo_support_tombfix009

kungfloo: Fix pull request #128