Merge pull request #57 from ohnova/master

rebase
Merge pull request #61 from ohnova/starry

Merge pull request #57 from ohnova/master