Fix whilst setup and solution
Merge pull request #11 from davecocoa/fix-whilst

Fix whilst setup and solution