Fix for issue #239
Merge pull request #242 from amithkanand/kafka_enhancements

Fix for issue #239