Update from cgeo/master

Update from original