new ipython notebooks
merge