Merge pull request #816 from Morphan1/master

I have no idea how safe this PR is.
Even less deprecation