BUG FIX: setQueue()
Merge branch 'develop'