Merge pull request #5 from jdfreder/master

Updates to match IPython#4112