fix issue #238 and #239
fix Calender paramFormat
Merge pull request #241 from osdream/3.1.0-dev

fix issue #238 and #239