Clean up notebooks. Issue #20.
Merge branch 'issue20'