Merge pull request #425 from frog32/change-current-meter