Changed name from MarkerLocator to marker_locator
Testing Pichi
Testing Pichi