Update from starter

I updated from the starter by merging it into your code.

There were some conflicts and some fixes to do (s/@ref/ref/g).

I merged it (and you didn't) so it looks like I added many commits into your history: look at the diff if you want to see the real modifications :-)