Timer fix
Gtk3 Port
Merge pull request #24 from miguelalba/gtk3

Gtk3 Port