commit
Merge https://github.com/lpotepa/notebookapp