Merge pull request #58 from ohnova/master

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

Boram