Merge pull request #526 from ndawe/master

[MRG] basic IPython notebook support