Iterator calendar init
Merge origin/master