update
Merge pull request #76 from ohnova/boram

update
Merge pull request #77 from ohnova/master

rebase