merged with master
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fixed syntax error in email worker
Merge pull request #40 from smspezzano/worker

Worker