.
Merge branch '#76-HoverEdit2' into #58-final