Use pre-increment for iterators (cppcheck complains otherwise)
More pre-increment fixes
Merge pull request #20 from po1/small-fixes

Use pre-increment iterators