few additions

Hi Benedikt,
i couldn't find how to pull only a specific commit so here are a few commits, i added comments so that you can find out what i did. 
hope you can select only the ones needed for merge.
Let me know.

Lionel