master notebook updates
Merge pull request #12 from tebarkley/combined-notebook

master notebook updates