Merge pull request #64 from ohnova/master

pull
update app
Merge pull request #65 from ohnova/boram

Boram