fix bugs
Merge branch 'master' of github.com:zjhzyyk/slide-maker