Minor improvement

Is this pull request still holding all the previous changes too? 
In that case I don't have a clue how to send partial pull requests. ;-)
The one I wanted to send now is "71ae4d8"