Merge changes for issue #77

Merge fixes for TeamDewberry/jmxdatamart#77 into TripwireInc repository from DavidWhitlock repository.