Made it ipython>=0.11-compatible