simplify location controller
Merge pull request #28 from timoschilling/patch-5

simplify location controller