branch: naito-ipython