Updating main branch

Creating a pull request for commenting ability
use camelCase, not under_scores for java field names