Merge pull request #25 from ohnova/master

pull
update setting
Merge pull request #26 from ohnova/boram

Boram