Better GTK 3.6 compatibility
Merge pull request #34 from shimmerproject/master

GTK 3.8 support