intermediate commit
merged conflicts
removed Ipython from test