Add location monitor
Merge branch 'master' of github.com:octoblu/lm-hackathon