diki Merge pull request #5 from geoprimitive/master …