bug fix start
Finish bug fix for iterator
Merge branch 'develop'