Merge pull request #273 from ReimuHakurei/master