Related with #6 #7 #8 issues

[ifraixedes]

Hi,
It is not a new issue, it is a comment for my 3 pull requests.
I wanted to tackle in reverse order, but when I tacked it, I realised of following one (#7) and after the last one (#6).

I don't know if it was better for you make three different pull request with each issue or one with all of them, but I thought better three different to better understanding what I tried to fix.

I know if you decide to merge #6 and after the next 2, those probably will have conflicts, so let me know if you decide to merge all of them and you need help with the possible conflicts.

[jaakkos]

Merged them manually and fixed merge conflicts :)