Merge pull request #2 from gbif/master

Update from original