Graphical annotations - this fixes #10