Change "while !" to until
Merge pull request #1541 from aah/patch-1

Change "while !" to until