bug fix with iterator and sortin
Merge branch 'develop'