Add support for monitoring current location
Merge remote-tracking branch 'origin'