Merge branch 'master' of https://github.com/yurifidelis/ExpCalc
Merge branch 'master' of https://github.com/yurifidelis/ExpCalc