Big merge clean

PR #11 did not stick, so I'm trying again.

I'm probably just screwing up the git tree...
Git is quite big for such a small name !