calculation
Merge pull request #11 from liaoxyn/master

calculation