removed unused code
getLocation method implemented
merged dev into tcuje