slightly more elegant solution to the tedious isFirst in loops
Merge branch 'development'