Updated to support ipython==1.0.0