Merge pull request #855 from Nekotekina/master

Various progress