Fixes #10 and #7 - Missing Figure 2.