Merge pull request #13 from cnnic/master

merge from cnnic
fix bug:format null
Merge pull request #135 from forumbyr/master

fix bug:format null