Merge pull request #79 from ohnova/master

pull
update
update
Merge pull request #80 from ohnova/boram

Boram