Merge pull request #1 from pkgeography/master

Merge pull request #15 from jabranr/master
Merge pull request #16 from jabranr/master

Merge pull request #1 from pkgeography/master