Merge pull request #2 from gbif/master

Update from original
Merge pull request #8 from nickdos/master

Merge pull request #2 from gbif/master