Making infinite loop optional (and not default)

Better? Not sure how to find your comment except via email :)