Merge pull request #50 from ohnova/master

rebase
Merge pull request #52 from ohnova/master

rebase
update for rebase
commit for rebase
Merge pull request #53 from ohnova/starry

Starry