Merge branch 'master' into ng-srx-es3
update voltage calc