refactor and add unit test
Merge branch 'Queue'

Conflicts:
	Queue/Queue.php