Merge remote-tracking branch 'cristian/master'
Merge pull request #5 from cjc061000/master

request try 2
Merge https://github.com/japuga/gis