Fixed iterator macros and legacy iterator accepts
Fixed indentation
Merge pull request #55 from 28msec/fix-iterator-accept-macros

Fixed iterator macros and legacy iterator accepts