Merge pull request #24 from natgeo/develop

Dev into Master
Merge pull request #33 from natgeo/master

Merge pull request #24 from natgeo/develop