Merge pull request #176 from antonblanchard/console-improv