Changed return types of iterators
Fixed merge conflicts