Merge pull request #1 from cgeo/master

Update from original