Fixing compile error on Mac
Fixing unix build errors
Merge branch 'iteration' into develop