problems with NotebookDirectory[]
Merge branch 'master' into mac