Draggable guide-point 

Fixing merge conflicts of #340.