Issue #2 - make looping optional