sync with intro branch
Merge branch 'master' into nook