Altered to work under Gnome3.10