Merge pull request #55 from ohnova/boram

Boram
Merge pull request #56 from ohnova/boram

update
Merge pull request #58 from ohnova/master

pull