sync git
Merge pull request #15 from yschin/master

sync git