Merge pull request #431 from danielschemmel/ubuntu-18.04

Remove the unnecessary use of a SCARY iterator that may break on older compilers