fixing everything
Merge pull request #8 from jereln/queue

fixing everything