Merge pull request #1 from kalxas/master

Added OSGeo stuff