Correct bug on 1st day of month/moon.
Merge branch 'master' into deployment