Added better functionality for queues
Merge branch 'master' of github.com:phonga/framework into develop