#371 Implemented iterate method
Merge branch 'master' into 371