fix calculate method
Merge branch 'email'