remerge and update cake-dog
fix initial bug
Merge pull request #5 from sailxjx/master

fix initial bug