Fixed build, fixed iterator
Merge branch 'master' into travis-cpp