loops added
Merge branch 'master' into ashton
fixes