Changes to be compatible with Gnome 3.10
Including test erroneously removed before
Correcting identation
Merge pull request #5 from cacarrara/master

Changes to be compatible with Gnome 3.10