Correct iterator
Merge branch 'master' of github.com:maresc-g/rtype
Correct merging