Merge pull request #62 from ohnova/master

rebase
Update
Merge pull request #63 from ohnova/starry

Starry