More Calc changes
Merge pull request #509 from cldx/master

More Calc changes