calculator
Merge pull request #17 from lihp2014/master

Merge Calculator from liqinglin