Using autojump script rather than directly including functions
Merge branch 'master' into isabelle