sync with OpenESPI-Common-java/etc
Merge pull request #124 from MartyBurns/master

sync with OpenESPI-Common-java/etc