java changes
Merge pull request #1 from rkommineni/master

Merge pull request #1 from msondheimer/master
Merge pull request #2 from msondheimer/master

Automation Changes