Created author iterator
Created author iterator
Merge origin/master