Merge pull request #54 from ohnova/master

pull
update
Merge pull request #55 from ohnova/boram

Boram