calculator added
Merge origin/master