Updating main branch

Creating a pull request for commenting ability
Have you explored using a library like GSON to make things easier?  We have used it here: https://github.com/googlemaps/google-maps-services-java.  I'm not sure how well it works on Android as part of another library but it might be worth considering?