Merge pull request #32 from ohnova/master

pull
update string
Merge pull request #33 from ohnova/boram

update html