Location enhancements

Closes #52.