updating the ipython notebook and plotting
Merge remote-tracking branch 'origin/master'