Merge pull request #775 from Nekotekina/master

Many changez