Merge pull request #4 from AtlasOfLivingAustralia/master

Sync fork with Master
Merge pull request #16 from nickdos/master

Merge pull request #4 from AtlasOfLivingAustralia/master