merge

Hi Robert,
I send you here a request to pull from the main branch. You could do this your self as well.
Mikael