Updated from multinotebook branch in lieu of git merge complications.