sidekiq tested ok in production.
Merge branch 'bugfix'
rebase with new upstream
Merge pull request #22 from castomer/master

sidekiq tested ok in production