Merge my master branch

As agreed, the commits are quite atomic and small. More to come.
At first it looked a bit strange to me (was never used to this style). The reason is it looks like "sizeof *times* contents" rather than "dereference contents and give the size of that type".