Improve queue factory and queue options

This PR addresses the issues stated in #27 .