Merge pull request #34 from ohnova/master

reabase
Merge pull request #35 from ohnova/starry

Merge pull request #34 from ohnova/master