Fix for issue #286
Merge pull request #287 from amithkanand/kafka_additions

Fix for issue #286