New branch

Commit #3 & Commit #4

The other will be reversed, by my rebase.