Merge pull request #830 from Nekotekina/master

Various changes