Fix #69 - IPython 1.x support, take 2