Merge pull request #71 from asankasanjaya/master

done some to dos
fix bugs
fix bug in worker
Today's final work
edited retry part