Kamalika/chef zero

@fnichol and @schisamo , Can you please help in getting this pull request.Its the fix for the issue mentioned in #346.