Merge pull request #46 from ohnova/master

rebase
Merge pull request #47 from ohnova/starry

Merge pull request #46 from ohnova/master