Merge pull request #847 from ahgittin/fix/kafka

partial fix for kafka 0.8.0-beta1 compatibility