Exchange ordinary loop by range-based for loop (#97)

Exchange ordinary loop by range-based for loop (#97) #171