Merge pull request #351 from SindenLightgun/master