Feature/bug lat long