8th commit
9th commit
10th commit
11th commit
12th commit
13th commit
Merge branch 'jerry-rig'