Merge pull request #394 from ledvinap/feature-blackbox-amperage