PR #22: Updating to work with celery 3.x