Commit 3 master.
Commit 4 master.
Commit 7 master.
Commit 8 first branch
Fixed merge conflicts from master.