Calculator

Merge calculator to dev