change month and week calc method
Merge pull request #235 from williamherry/hotfix/month-and-week-calc-method

change month and week calc method