Closes #15
Merge pull request #21 from jcgharvey/location

Closes #15