Merge pull request #1 from webmapper/master

Make compatible with QGIS 2.0