added sidekiq
merging from upstream