Issue 5

It seems these branches can be automatically merged.  I suggest we first take a look and then do the auto-merge if we like what we see.