NB code
Merge pull request #62 from emsiepopples/master

NB code