Merge pull request #20 from jsgirls/master

sync