fix bugs
Merge branch 'master' of github.com:shenyan2014/webkits