Address #9. Depends on https://github.com/ipython/ipython/pull/5469