fix bugs
Merge branch 'master' of https://github.com/oilbeater/oilbeater.github.com