Working on loops
Merge branch 'loop-branch'