Include @wwaites GRAPH support. 

(was: https://bitbucket.org/ww/telescope/commits/885bbb670ba2556f95c4d25a4f777e196e66eab0)