Better bounds control.

Fixed #8