Created author iterator
Merge origin/master