updated for bokeh 0.3