Allow for better maintenance of temporary queues and topics

Fix issues #53 and #54