Improved support for #2

(and changed default limit to 128, but now it's configurable on
costruction)