Merge pull request #938 from Nekotekina/master

Various changes