feature/location

Fixes #79