Fixed #6 improve queue speed and scalabillity