fix bug
fix bug in chrome!!
Merge pull request #25 from AoteChou/master

aote almost final