Working on #7.
Fixing #10.