Fix of queues
Merge pull request #42 from marcinlawnik/develop

Fix of queues