Created a while and do while loop
Merge origin/master